Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 20 May 2010 13:29:53 +0000 (13:29 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 20 May 2010 13:29:53 +0000 (13:29 +0000)

Trivial merge